[PATCH] <short summary of the patch>

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

Gbp-Pq: Name Version_2_7_2pre12

diff --git a/cmpnew/gcl_cmpfun.lsp b/cmpnew/gcl_cmpfun.lsp
index e7f36a088ff18e9a38ae87f519a04b9762097aed..eb0c288dd68315ca1bb85a208ce84a381f9b7645 100644 (file)
--- a/cmpnew/gcl_cmpfun.lsp
+++ b/cmpnew/gcl_cmpfun.lsp
@@ -112,7 +112,11 @@
 ;;       (list 'call-global info 'terpri (list stream))))
 
 (defun gcst (n &optional e)
-  (ms "(object(*)(" (cdr (mapcan (lambda (x) (declare (ignore x)) (list "," "object")) (make-list n))) (when e ",...") "))"))
+  (let* ((m (min n (- call-arguments-limit 2)))
+        (l1 (make-list m :initial-element ",object"))
+        (l1 (when l1 (cons "object" (cdr l1))))
+        (l2 (when (> n m) (make-list (- n m) :initial-element ",object"))))
+    (ms "(object(*)(" l1 l2 (when e ",...") "))")))
 
 (defun c2apply (funob args)
   (unless (eq 'ordinary (car funob)) (baboon))

diff --git a/git.tag b/git.tag
index 4b0fbbf3fea6962a536922438322fa2a5fcd370c..0252445084f4cd4ee67b90773aa45a02ebecfe0d 100644 (file)
--- a/git.tag
+++ b/git.tag
@@ -1 +1 @@
-"Version_2_7_2pre11"
+"Version_2_7_2pre12"

diff --git a/h/error.h b/h/error.h
index 6eac3d9d5804265a9863383e6e93e298b96e9f15..e6f7a4ace46bb66ecd6388b43b5c599f291ea66b 100644 (file)
--- a/h/error.h
+++ b/h/error.h
@@ -99,7 +99,7 @@ object ihs_top_function_name(ihs_ptr h);
                                                  sKformat_control,make_simple_string(a_),sKformat_arguments,list(1,(b_)))
 #define FEtoo_few_arguments(a_,b_) \
   Icall_error_handler(sLprogram_error,null_string,4,\
-                      sKformat_control,make_simple_string("~S [or a callee] requires less than ~R argument~:p."),\
+                      sKformat_control,make_simple_string("~S [or a callee] requires more than ~R argument~:p."),\
                       sKformat_arguments,list(2,ihs_top_function_name(ihs_top),make_fixnum((b_)-(a_))))
 #define FEwrong_no_args(a_,b_) \
   Icall_error_handler(sLprogram_error,null_string,4,\
@@ -112,7 +112,7 @@ object ihs_top_function_name(ihs_ptr h);
 
 #define FEtoo_many_arguments(a_,b_) \
   Icall_error_handler(sLprogram_error,null_string,4,\
-                      sKformat_control,make_simple_string("~S [or a callee] requires more than ~R argument~:p."),\
+                      sKformat_control,make_simple_string("~S [or a callee] requires less than ~R argument~:p."),\
                       sKformat_arguments,list(2,ihs_top_function_name(ihs_top),make_fixnum((b_)-(a_))))
 #define FEtoo_many_argumentsF(a_) \
   Icall_error_handler(sLprogram_error,null_string,4,\